Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 22 Apr 2010 07:53:53 +0000 (07:53 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 22 Apr 2010 07:53:53 +0000 (07:53 +0000)
commit7f0dc4b3f450096876b9821bf98bb94f9165643f
treeeab9ee03884662f4277473c9677fbb57b5f2b69b
parent6c57bf3f72e7ac86d3964c40b513d9248678140e
parentc0d43b115dda9ebd276919a20192db86ba333c8f
Merge from mainline.